fix returning of arguments