refactor police tape fix @ 1323