fix bugs by calling return properly