actually fixed crashing issue