Fix for number types inferred by match