Fixed bug IOT-791