Fix import and stub