Fixing linearization issues