Fixing case-inf