Temporary fix for crashes on loading