Upcoming OS fix