make handler singular