modify _findAndModify to address recursive locks
Merge pull request #1 from Mobiquity/feature/recursive_locks

modify _findAndModify function to address recursive locks issue