[artf653740] Jnj bug fixing