continuation of fix for issue #2