JR1016 Initial working fix