Fixed regexp and fix goto function