Fixes for JSON (see #6)
Reverting