Fix for issue #230