try to fix the bug mention in last commit.