Cleanup
Fix crash bug