Fixed, also moved the else