Improves #285 with EJ's regexp