Fixing places, where param checks reported problem