More Ding's Fix

same as before