Another desperate attempt at fixing crash.