Fixed bug where values could be re-assigned