Contact feature fixes #7