Fixed part of mapbender/mapbender#85