Fix for tickets #1560 and #233 of Ingestion