Work around JBAS-8375