IMPORTANT / Fixed issues with cloning of non-clonable properties