mpen-11 #1669 (mpen-11)