Fixed bug with ellipsis
Fixed bug in ellipsis handling