* fix #1114 issues * fixed code style * update for all version * add test for bag 1114 * remove comment Co-authored-by: georgio <georgiokot@gmail.cim>