Changed regexp a bit