seem to have fixed the crash