fixed and updated to extension copy