Fix for issue #379.