Added the test and the _improved_ fix