Fixes pluralization of maps