Re #6366 update I(Q) calculation