Fix 'tuple index out of range' error