Fix for issue #235