fix copy/paste problems