argh, JSON library was modified in previous branch! Now restored to normal