incremental fix on self referential constraints