Fix return class