Fix Map return type error not previously caught