Quick and dirty fix for escaped objects