Copy change from Issue #23.