Small reordering of extraction arguments
Testes uncovered upsampling bug; fixing (?)