Fix for interactive mode