Fixed an issue with call generation