Fixed function declarations on Issue #430