Fix corner-corner collision (#215)