Fix parser conflict