Added similar behaviour for interactive=True.