[mr3122] Temp fix for double map creation