- By Benjamin. Fixed bug 2945 and CFF.