Bug/acm dsc 680

see dsc-680 comments.