Fixes index issue