Fixing claim issue