[IMP] Slight improvement