Fixed some rules