fixed bug with always returning pair:true