Fix return path