Not crashing anymore.