Fix overwritting of value