Fix to match config