domain change bug fixes
domain change bug fixes