fixed signature issues