Added a unit-test for my fix