Fix for some number formats