updated to fix an issue with right click, paste