- By Benjamin. Fixed bug 2751 and 2716.