Fix for issue #379.

Fix for issue #379.