- make check more forgiving to handle the current DB