better support for pasting