fixed non working return