fix issue #4

Do some hotfix, I don't know if it output what your expected.