regexp format changed