Added fix to prevent changing a resource ID