Fix IncompatibleClassChangeError