Interactive mode: bug fix