Fix for issue #171