-fixed crashing