Improved args to work correct with pass