BZ991 : Attempt to fix concurrent access to maps