Fix issue with uncloned subclasses