Better fix for false image Grabbit bug