v1.0.0.20 - new attempt to fix the .clone() issue