Extract improvements - Swapped the arguments

Fixes #1119