Fixed function-definitions