Fixing warranty replaced issue