Baucus, fixes #525