Fixed issue in return