Better match upstream