Fixed map numeric values always being null