I wonder if he was switched at the very last minute. You know how sneaky Jack is!
I was thinking that too. Maybe Chloe did some monkeying with the drone's camera, made it "see" Heller when Heller wasn't really there.
But I guess some things are even beyond Chloe.