FIX partially json handling