GEN-173 #resolve fixed