re-submission of bug fix for issue #95