Fixed return issue