Fix for startup spam