Avoid address clash when redeploying implementation

Avoid address clash when redeploying implementation #1131