continuation of fix for issue #99