Fixed issue with root property being not reatained