Improved compatibility with new weekly bundle