fixed case where accepting comes last