Fix class block scope issue #4