fixes #4621 the crash seemed to be caused by signal of signal. Simplifying the flow remove the need for this signal of signal