package_safe should use $2, not $@