Attempt to fix the horrible issues that have been caused by the MD cha