should fix the empty return