Undid bug workaround, improved flow of JsonConverter