#313 - Fix edge case for rule builders and incorrect parsing