Fix return issue