- By Benjamin. Fixed bug 2463.