Bug fies around copy and paste - still not perfect though