Fix for issue #231