Fix error, where overriding Model and then invoking toMap(), only affects the one we invoke (sub model not included).