one last quick attempt at a fix