redone for issue #111