WF-1808: Fixed the Rule Parser