rules fixes