Bugfix for vanishing maps, but real solution on the way