more fixes on the regexp