Improve aimed track detach mechanic