Finally fix to keep Hsql as what it is