Maybe fixed crashing?