Apply the int32 hotfix to dmap.h