Fixed hdb_tool