fix issue #60