Updating parser, to fix fork problem