- By Benjamin. Fix bug 2729.