Fix regex for 1.8.7