Fixing from merge