Fix for copy/paste