Configuration bug fix