Be more careful with symbol-value. Issue #299