Fix bug 15 and add test case