Minor improvement, learned from OPTIQ import