Fix for startup