fixing issue SW-16