Formulation, fixes #138