Hot fix for different json setups