Fixed map reference not being created