Fixes race condition that exists due to action server autostart