Fixing option loading