Fixing issue with parsing initial value