Is this to fix #780 ?