#121 fix
#122 fix
#118 n #119 fix