InnerClass fix