[FIX] Don't remove comment value