mpen-09 #674 (mpen-09)