- By Benjamin. Fixed bug 2627 and 2629.