Fixed HSQLDB (I think).