Workaround for asynchronous json bug
4 files changed