GJfix2

GJfix2