Make nested calls work as expected