fix bad mac checking
resolve merge