Fixed: bug introduced in the refactoring

Found during Bear's review, proof that it was useful ;-)