fix final problem :(