Fixed on On Save and Build Index