Fix and support for the new signature calculation