finally a fix