69696 repairing clone user context

Changes in Parser