- By Benjamin. Fixed bug 2931, 2941, 2910 and 2938.