fixed build after updating code from upstream