#386 Better place for condition