fixes according to testcases