Fix for configuration