fix issue setup flow