DI's bug fix for MAP