[FIX] before refactor