fixed restarting issue