Fixing from last night