Fixed copy-paste