Fixed issue with index-only operation