yet another conditional fix