Fix Destination Checking