Fix issue ST-142