fix primitive args handling