Improve collision. fixes #74