- By Benjamin. Fixed bug 8030.