fix for non-zero-indices