- By Benjamin. Fixed bug 2746.