fixes according the tests