for issue #60