- By Benjamin. Fixed bug 2943, 2944 and 2942.