* Fixing restart on tap