- By Benjamin. Fixed bug 2721.