two more fixes to Extract Function