- By Benjamin. Fixed bug 3044 and 3045.