cleanup
fix for first map not taken