bugfix: map needs to be checked, too