Fix another issue with out of bounds

Fix some bugs with crashing due to out of bounds

Initial commit