Better fix for override urls