- By Benjamin. Fix bug 2895 and 2896.