Fix for ambiguous function calls