Fixed another typo, and condition