Configuration bugfix