- By Benjamin. Fixed bug 2731.