a more exhaustive search for #385