Added workaround to formulas