Added destination check to fix #44