minor bugs for AAU1 fixed