Fix for wrong array index