Minimal change to make using the tool less bug prone