- By Benjamin. Fixed bug 2708.