offering deprecation fix and locations replace fix