Still working around the ISR fix