Steps towaerd fixing issue 374
Fixed https://github.com/rec/echomesh/issues/374