- By Benjamin. Fix bug 2703.