Fix for issue #71