Try to handle copies better