fix agent and add non zero option