Changed regexp