Fix return and typo