Attempted findAndModify fix