Fix to ensure that complete status gets correctly set