Would this be another hsql fix?