Fixing case conflict