Bugfix: fix out of bounds write Tests: ran unit test combination that previously failed - now passes