Fix for DT-537