fixed some parser