Fixes #2; a.k.a 'Fatal error in upcoming update'