- By Benjamin. Fixed bug 2580.