Fix 6250: declare classes inside eacFix 6250: declare classes inside eachh