Corner case fixed