binarys updated, improved MapHandle check