Attempts to resolve class definition leakage