refs #5 - and solves the clash problem for now