Bug fix in moving classes.