fix output type in a more elaborate way

Слиты nikitronn запросил слияние b28_join_fix в b28_prelease_master

Created by: zeffii

uses a less defensive update function. is this OK ?