- By Benjamin. Fixed bug 2609.