- By Benjamin. Fixed bug 2748 and 2753.