#369 Fixed with unit test.
#369 Fix after review
#369 Fix after review