fixed crashing