Final fix for native copying