fix require statement
merge upstream