Add workaround for copy issue