Temporary fix DBI