Fix for arguments in manager