- By Benjamin. Fixed bug 2598.