fixed wrong return