Better fix for extended function call