Fix for startup issues