Changed the destinations handling