Fixed "out of bounds" issue