regexp change, as suggested by Chriso.
tests pass