repeat from the other PR: could this just be return True?