#1078 Fix for clone page