Fixed JSON for Android