Better fix for the dev tools processing