Additional tweak to CheckParameter