Enh: fixed interface