mpen-11 #609 (mpen-11)