- By Benjamin. Fixed bug 2608.