Fixed return path