Added out of bounds crash fix!