Fix bug in the deployer and comparator