Multiple assignment fix