rule fixes done