Emergency Update 2

Things happens. Commiting emergency update.
Crashes...