Fixed some imperfection dued to the domain change