Fix early finish problem introduced by dupe message fix