seems to solve but broken