Another fix for internal process