Fixing #3215.