Fixing problems in the new set of rules