Fix for issue #360.