[WO-259] introduce proper signature checking