Apply the id fix to trim