Fixed missing assignments