Fix mapping HSQL