Final config fix