remove 1.8.7 regexp warnings