fixed bug to prevent requerying