Bug fix for duplicate function names.