- By Benjamin. Fixed bug 2610.