- By Benjamin. Fix bug 2629.