Fixed other if conditions