Fix comparator requirements for builder
Merge pull request #1744 from Prototik/builder-comparator

Fix comparator requirements for builder