key checks fixes
#97 #98