Reverted last commit, implemented json workaround.