Bug fix, test case.