Temporary configuration fix