offset fix & figure check recursion fix