Fixed to handle more than one +