Fix for issue #70