J69 fix v1.14