fixes #5970 - don't rely on setting model being functional
Release v2.0.8