Added ^$ to vertical regexes
@todo: DRY would have prevented this bug...