Fixes the "long delay" issue for init