Hopeful fix for pat's issue