Fix for issue #70

closes #70