fixed 2 bugs
rocket-fw: regex