Fix bug with takeover feature