Fixed config handler issue