Fix problem with source mode and internal lists