[FIX] Potential regression