MD bug fixed