Fixing Empty list - issue #286

trying to fix failing cases with empty lists