Better handling of non working copies