fix issues in the previous commit