- By Benjamin. Fixed bug 2994 and 2995.