Fix for non-interactive launch
Fix for test R02