Using index hint fix