Fix parser calls