modify _findAndModify function to address recursive locks issue