Close #53 Guards unit handling.