Try to fix the calling_module issues with inheritance