fixbug: ISSUE #27