fixed the empty return