- By Benjamin. Fixed bug 2718.