Fixed JSON issue