fixed a typo and combined conditions