- By Benjamin. Fix bug 2732.