Fixed awkward restart issue