Fixed jjs issue