Card #48 fixed DM changes