fix critical issue for issue #65