Fixed shutdown in another way