Fixed initialiation workflow