Bug fixing on save claim