- By Benjamin. Fixed bug 2494.