Fixed a bug in fill found with new tests