[enh] handle first case with martin