fixed multiple duplicate entry issue