Additional fix for copy/paste.