fix extractor code which relied on evaluation order