Fixed config-handler issue