latest fix from Caitlin