Adding a bit more width in the degenerative cases
adding clone and fixing same case