Fix for issue #402.