possible fix for DDC-2021