Stops constructs from hitting themselves

fix for #3576 hopefully.