re fix issue #60