#516 Improved copy