Added fix for _source=True.