JR1036 fix