Temporary fix for signature calculation.