fixing location not connected issue
using Leave after and Arrive before toggle