Fix for online start