Fixed more unit dirty work when it moves wronly classes...