Quick dirty fix to get Function Invocations working.