- By Benjamin. Fixed bug 2708 and 2702.