- By Benjamin. Fixed bug 2629.