Temporal fix for Clone handler exception.