Attempt to fix DTMS