Domain conflict check fixed.

see #591