Fix classes and sample