Global whenReady fix
0.6.6.1