Container fix: off by one