fix problem with FlexibleMap causing some unit tests to fail