cut'n'paste fix