Contact bug fix