fix problem from issue #60