fixing issues ESTIMOTE-16