Quick and maybe incomplete fix for passing over