Fixed cut&paste