Issues/738 overhang admin fix

Depends upon #906