Fix signature calculating