Critical Rules Bug fix