#97 fix the bug