I'm not sure i'm following this change, the other else should catch this?