Reapply "Avoid possible issues introduced with copying every time"

Reapply "Avoid possible issues introduced with copying every time" #256