Bug Fixes

- Fixed "Shutdown" feature not working correctly