- By Benjamin. Fixed bug 2668 and 2627.