Fix value parsing