Previous fix is still buggy, this one really fix that bug