Strengthened the destination check