fix for nested classes