fix to pass tests, maybe not right and i will come back to it