Fix import and assignment