Fix to good regexp