Fix entity rule problem. closes #2635