Attempt workaround for initialization order