Fix contact bug