Added propper support for a corner case (this time it is working).