ugly correct solution, fix looks