Added propper support for a corner case.