case 3183 - Correcting if checks.