include fix #23 in vNext