Fix for configuration options