Probably fixed issue with to_json