Post compo bug fix #1