Guangyao Bug fixes for the contacts