- By Benjamin. Fixed bug 2676, 2675 and 2749.