Fixes cloning issue raised during #323