Fix thermal expansion support?