- By Benjamin. Fixed bug 2913.