Fix returns
Rebuild parser