Fix bug when multiple + are passed in