Fix for Olli and Petri crush