Fix empty return lists