- By Benjamin. Fixed bug 2506, 2755 and 2756.