bug fix
merged with r2_contact