JR1047 initial fix
JR1047 tagged