fixbug: ISSUE #28