- By Benjamin. Fixed bug 2676.