Mbw/counselor input fix