Fixed font lock overriding