fixed wrong assignments