CDB-3079 just another attempt :-(