Bug Fixes

Fixed issue of not stopping when diagonal