Doesn't the Kingdom expansion solve this problem? o_O