fixed #94 + test case