merge Dave's HSQL fix