Fixed: Another bug related to the domain switching.