Fix return type problem