simplify mavericks behavior