Revert "fixbug #13"

This reverts commit 513fddfd18914408912ed6524a3313c1905923d9.