addressing issue SW-16