Make calls parse correctly