Fixed in the next commit. Once we agree that everything is fine I can squash the commits.