Issues/738 overhang admin fix