mpen-12 #607 (mpen-12)