fix this bug and test