Suppress warning
Fix restart bug (restart can now be pressed once)