[FIX] Issues