merged with next and test case fixed