Temporary change for HSQLDB for performance