fix feature 2 bug