- By Benjamin. Fixed bug 2630.