CFY-1025 fix handler configuration