modified bug & add contact handle