Fix for issue #233