Added beforeEnterExit back in which was accidentally removed for some reason in [d1dab1b]