-  By Benjamin. Fixed bug 2750.