!squash !!
Fix for clone being asynchronous