Fixing index out of bounds exception