functional context fix for clone