Fix for DT-485