Removed json check