Workaround for json schema bug, fixes #2726