Bugfix on version-dependent settings