Configuration bugfix 2