backup of copy paste bugfix