Fix issue 67 and add a test