Added more to fix this mongodb bug