Another fix for signatures