Nice work! :)
So, is there a unit test to make this waterproof? Since all tests were green before... ?