Fixes json issue in #1163