Fix for updated signature functions