Bugfix for gossi/common 0.3