Hopefully gets restart working properly
Updated due to publish