Minor Fix (removed cloneable