JR1025 call the new method; JR1032 fix