Quick patch for interactive and Java V2.1