Fix for issue with node inside hazard - still needs refining as a solution