fixing some returns