Fix for issue #236