changes required for issue #98