fixed missing import resulting from merging with master