#408 Improved copy