including fix for copy/paste since it has a similar fix