Bug fix: Handle the elipses character properly