Fixed issue with values not being correct