Fixed pasting issues