[IMP] Minor improvement