Better fix for M.D. issue, that also fixes #4