still tring to work around mongo driver bugs