Fix bug for better that