-BUGFIX: value parsing robustness