Additional diff fix for the new clients