Fix cut'n'paste