Fix buffer overflow

[rpoelstra]

This is the fix that I applied to make the code workable in combination with the synchronous remote.

[galagaking]

👍