a bit more of a fix