Fix signature generation