Fix return type is primitive problem