Need to fix off by one error