This seems to fix #95
It is an UI issue, should not have any interaction with the protocol itself.