Added a very naughty workaround for the molecular weight.