attempt to fix logic, this does cause consensus mismatches