SCRPJ-3 fix some bug