Another signature related fix