improved Mac behavior