Fix for the copy and paste
(quite dirty but for the moment it works)