mpen-08 #674 (mpen-08)