Fix for internal task