- By Benjamin. Fixed bug 2937, 2938, 2939, 2940 and 2936.