Fixed the regx part