Fix for —no-interaction