Fix for configuration manager