fix for Jake's problem