Fixed version of removing copy-paste.