Further fix to the internal task