Made the fix apply to all unices and added a unit test.