Theaddressbook fix for #213