Fix Configuration Handler