attempt at a fix