DC/Melanie | #3100 | fixinf bugs from feedback