Copy changes introduced in Baobab 1.3.1