Finaly fix rules