Fix sort key growing