annoying conditional fix