ref #1226 [Protocol v2]

- fixed major bugs