[FIXED] Some syntax bug fixed