Quick patch for interactive and Java