Need to fix function lookup.