Fix for non-variable index names