Fixing interactive mode