Fix scope issue

Still need to fix async issue =(