another attempt at a fix