better fix in auto_db