Fixing start-up issue