Upcoming plan fix