#145 fixed
#145 sync on work