Fixing issue with startup